Merge calibration branch#2
Open
PyrApple wants to merge 23 commits into
Open
Conversation
…c 10x10m cube for VRPN distance calibration)
Conflicts: model.processor.py
I found the original paper with this implementation (continuous cube map), and updated the code accordingly to match the original paper more precisely
In order to do the same in your file: Shift+F1, select model.blend, go in objects and select Cube.001 Put the this object in the same position as the HEADTRACK.PROJECTION.HEAD Make HEADTRACK.PROJECTION.HEAD the parent of Cube.001 Done
… both cameras face +X)
(no use for architecture specific scene name yet). added some objects and textures in new model-calibration.
for merge with master (master has model.blend only, calibration has model-calibration.blend only)
Owner
|
There are a bunch of commits here that were originally in origin/master (aka my master). It's better if you merge origin/master again (the pull request will likely be updated automatically). |
calibration branch merge
Owner
|
And consider rebase -i your changes into groups of commits (or even squash all the script commits, and all the BLEND commits as two commits total). For that usually we work out of a branch (even in your local repository), keeping master always 1:1 with origin/master. |
Collaborator
Author
|
saw that asa I committed, sorry. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.